projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8b990b8 d3852a9)
Merge from origin/emacs-24
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 3 Mar 2015 22:21:26 +0000 (14:21 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 3 Mar 2015 22:21:26 +0000 (14:21 -0800)
commit9792a944dcf08a246bf2618b2a5bee906a888069
tree495e6fbc120a10c383e5572b5e9b879f74cbb71etree | snapshot
parent8b990b89011d5b954c794e08549776b15e34fff1commit | diff
parentd3852a99c99f0785425a3a4c9d48d31e9aeec7c9commit | diff
Merge from origin/emacs-24

d3852a9 * admin/admin.el (manual-meta-string): Use bug-gnu-emacs.
d69e9f1 CC Mode: Stop Font Lock forcing fontification from BOL.

Conflicts:
admin/ChangeLog
lisp/ChangeLog
admin/ChangeLog diff1 | diff2 | blob | history
admin/admin.el diff1 | diff2 | blob | history
lisp/ChangeLog diff1 | diff2 | blob | history
lisp/progmodes/cc-mode.el diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.